From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 27 Oct 2014 15:44:31 +0000 (+0100)
Subject: EFI: constify a few table pointers
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4122
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4ed4dc689761a5597a492aeef89aff50cd9b39ef;p=xen.git

EFI: constify a few table pointers

We shouldn't (and don't) modify any of these tables.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index d31b0f99ca..3a71d7ac9a 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -75,7 +75,7 @@ static size_t wstrlen(const CHAR16 * s);
 static int set_color(u32 mask, int bpp, u8 *pos, u8 *sz);
 static bool_t match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2);
 
-static EFI_BOOT_SERVICES *__initdata efi_bs;
+static const EFI_BOOT_SERVICES *__initdata efi_bs;
 static EFI_HANDLE __initdata efi_ih;
 
 static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut;
diff --git a/xen/common/efi/efi.h b/xen/common/efi/efi.h
index bee3b77bf2..c557104abc 100644
--- a/xen/common/efi/efi.h
+++ b/xen/common/efi/efi.h
@@ -18,12 +18,12 @@ struct efi_pci_rom {
 };
 
 extern unsigned int efi_num_ct;
-extern EFI_CONFIGURATION_TABLE *efi_ct;
+extern const EFI_CONFIGURATION_TABLE *efi_ct;
 
 extern unsigned int efi_version, efi_fw_revision;
 extern const CHAR16 *efi_fw_vendor;
 
-extern EFI_RUNTIME_SERVICES *efi_rs;
+extern const EFI_RUNTIME_SERVICES *efi_rs;
 
 extern UINTN efi_memmap_size, efi_mdesc_size;
 extern void *efi_memmap;
diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c
index 1a0caea212..c840e083e6 100644
--- a/xen/common/efi/runtime.c
+++ b/xen/common/efi/runtime.c
@@ -21,13 +21,13 @@ const bool_t efi_enabled = 1;
 #endif
 
 unsigned int __read_mostly efi_num_ct;
-EFI_CONFIGURATION_TABLE *__read_mostly efi_ct;
+const EFI_CONFIGURATION_TABLE *__read_mostly efi_ct;
 
 unsigned int __read_mostly efi_version;
 unsigned int __read_mostly efi_fw_revision;
 const CHAR16 *__read_mostly efi_fw_vendor;
 
-EFI_RUNTIME_SERVICES *__read_mostly efi_rs;
+const EFI_RUNTIME_SERVICES *__read_mostly efi_rs;
 #ifndef CONFIG_ARM /* TODO - disabled until implemented on ARM */
 static DEFINE_SPINLOCK(efi_rs_lock);
 #endif